Back out bug 1031945 for now because we have silly pref settings on mobile and dumb tests.  a=orange