Bug 944178 - Back out 6ca43b5171c1 (bug 943451) for breaking urlbar taps