Revert r254626 to fix the build.