Revert 65e9e88..957995f

This rolls back to commit 65e9e8891afb1fd3c0e072f6ee38cbeecae999b3.