Revert r31153. It failed to build on: