Revert de9aa98..f0e85e7

This rolls back to commit de9aa98491f1bd16eaea1c2f645b8e0724862e42.