Revert 6216f18..2870f09

This rolls back to commit 6216f18c5063e31eb4a250fa9cc9f37bdc2ed1fd.