Revert MFC of r330233
This was an additional commit that I did not intend to MFC... and also broke the build
Pointy Hat To: me