Revert r67655 and r67656, as they are breaking the build. I'm