Revert 7981e82..f8cfbf4

This rolls back to commit 7981e82a8293c61a5e71dda834d6a16be65cbcfa.