Revert b8f0f85..60ee164

This rolls back to commit b8f0f85048bfe1ecfdf76b4f3c22999f901a559b.