If both are needed that this shouldn't just be a simple replace.  We'll need to have that link turned into a parameter or env var that can be set per-run.

Also, this patch breaks spec.