Revert (4/25)

Revert