Revert 8a62e33..7e9e107

This rolls back to commit 8a62e3343b1ac4fd829692db1be4d5824ab8bfe8.