Revert f60b8b7..162cd10

This rolls back to commit f60b8b73b153c33b865231c27709a39d44a117e9.