Revert f629b61..37a4977

This rolls back to commit f629b614fc288e81a7180ed9a62bb80cebe4aef7.