Revert a24075f..b0a12c6

This rolls back to commit a24075f8081af05e4e42476fad445aff63bc4033.