Revert commit (9/31)

Revert commit