Revert (7/25)

Revert