Revert eb0fe39