Revert r205599, the commit was not intended to have so many changes