Revert r272189, the committed version was an old version and breaks build.

Pointy hat to:	delphij