Backed out changeset f706ae697922 (bug 1541317) for failures in test_ext_settings_overrides_search.js