Revert c6fd871..9da5b9f

This rolls back to commit c6fd871035cda26334418d9bbac330eaa7f0832f.