Revert r78914, as it was breaking the build.