Revert 37ac734..f6060d5

This rolls back to commit 37ac734472b496c76115a925a01af805b6bb6892.