Revert commit (7/31)

Revert commit