Don't assume urls have to contain //
(cherry picked from commit b00f28c6bfaa425e1f728e004a2e828fc08e60c6)