Revert 05b1617..fef07cd

This rolls back to commit 05b1617662878ec1a152d4bc6c0873b02f7fdc6a.