Revert 9fd2b91..d57740e

This rolls back to commit 9fd2b912a2ccda335c618a2534551f27b6b4c291.