@samfoo
Re-parse URL to not have inconsistent state
8a401d5