Use existing wait-to-finish url (bug 1036974)

yeah, this looks way better. I think in paradigms like this you just need to touch one part of it, you don't need to test the full matrix of possibilities