Revert b0f5ac4..0259516

This rolls back to commit b0f5ac4af24ddd2ab5f79abadb6135a33c8e5514.