See $URL and blocking bug.
Created attachment 260163 [details, diff] upstream patch
Seems this would help with bug 351998.
Fixed. Thank you