Revert (6/25)

Revert