Revert r272532,

It broke the build.

Pointyhat:	me