Revert MFC of 310847 and 310864

Requested by glebius who had questions about the original
head commit that I didn't see.