Revert 7c2cc31..b0e41d3

This rolls back to commit 7c2cc31e621adecb9ccba0b5ffd7fc0d977e5b8a.