Revert (12/25)

Revert