Revert 4a01954..cdf52f5

This rolls back to commit 4a01954442660fec6a700b9c8e8e82aea24813ce.