Revert r190902 and r190906

The first one broke the build, and the latter one made it worse.