Revert (5/25)

Revert