Revert 6736802..d6bee83

This rolls back to commit 6736802bf52b6a37d352703380f4dab2ad1a64d5.