#1186 and #1148 solve essentially the same problem but in 2 different ways. For the general case we should go with #1186 and create a utility function that is then used in other places to normalize out the path construction.