Revert 37801 because it still breaks the release build.