Why? Surely returning the url dosen't need a web connection? Also why is this in this PR?