Revert commit (6/31)

Revert commit