Revert c57239f..589bfec

This rolls back to commit c57239f51f964a2d7814978aa9b5c49504a08a66.