Bugfix for earlier URL robustness fixes.