Revert some old changes that got pushed in.