Revert 9bb6647..d7f9836

This rolls back to commit 9bb6647b9d0341592dd119a4ed965dd1f1ed7c78.