Split from #4553 since that requires a bit of a refactor, but just using relative paths would help significantly too.