Revert "Merge branch 'sb/submodule-core-worktree'"