Revert 3201dcc..9981c01

This rolls back to commit 3201dcccfb86088691715f2b3b72fb5bd2716c4c.