Revert last 6 commits