Revert commit (10/31)

Revert commit