Revert 35a75b7..ec7599e

This rolls back to commit 35a75b7a34624423db979e5bd4bd1176a49950b2.