Merge "Revert "Temporary revert to fix the build.""