Bug 1047607 - Remove URL search hacks. r=margaret