Revert 11 commits from original repo