Revert 3c90257..01d97e9

This rolls back to commit 3c90257da3efe9ad6c5d9f5ec1ab69341867f51a.