Revert r77358, didn't have intended affect, and broke unittests