Revert the series of commits starting with r166578 which introduced the