Remove path.join from urls, in response to #2796

WIP