Revert 6a8b977..457db60

This rolls back to commit 6a8b977314003964b2e5057459c4ca5cb41af82c.