Revert 2f36ca1..4df6f80

This rolls back to commit 2f36ca17eb0aa0b438a6b2fbbe8dab89c84dfa8a.