Temporarily revert r189363 as it seems to be failing to build.