Backport urls fix to 0.5 branch.