Revert dbcc1fd..170181e

This rolls back to commit dbcc1fd71326c775b74d451cad7016e779c0c19a.