Revert 9613463..08437ee

This rolls back to commit 96134639728aad787436138a786961c2ac0875a2.