Revert last 2 commits