Revert 0d18582..7e77d8b

This rolls back to commit 0d18582f6327801b419dcdfd20dbeb149aca7eeb.