Revert ab0a9ea..f6ef4c6

This rolls back to commit ab0a9ea391d6cdfd7cbc12a863b500ebb22729d8.