Revert "Merge branch 'ps-remove-get-repo-path' into 'master'"

This reverts merge request !2935 (merged)

Looks like there are some extra changes merged in master that aren't compatible with this. Will have to revert and fix.