Apply D5832 to Phabricator
Summary: Brings the Javelin change in D5832 into Phabricator.
Test Plan: Hit a /?&x URI without hanging Safari.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran
Differential Revision: https://secure.phabricator.com/D5833