Revert 7f511ff..8df87cc

This rolls back to commit 7f511ff9bfacafedaf2faa0bc0876a671d2cda68.