Revert some unwanted changes

Test plan: none

Auditors: alex