Revert some unnecessary changes
Merge branch 'master' into mburton/cursorloader-pr