Revert 886ab42..e7f7ce8

This rolls back to commit 886ab42bdb22b11ba3c30a317f462e7bd4dbe2f1.