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