Revert a9b94c9..9ed0f0c

This rolls back to commit a9b94c98469d3a7cd623b8f95f061c7ebfebf358.