Revert 7f6ae36..f0afee1

This rolls back to commit 7f6ae36df22840abf9823bd1732e9fd63b7c4aea.