Revert commit (11/31)

Revert commit