Revert previous 2 commits