Revert 2 commits