Revert commit (8/31)

Revert commit