Revert 8aea9b2..190e409

This rolls back to commit 8aea9b201735602879d947843b0c7108b432b8e3.