Revert 77d8373..0b9431f

This rolls back to commit 77d837387d98e78ae990c164d7c4f84a2cbf93e8.