Backed out changeset 3048c1c1ee92 (bug 833795) to fix bug 856083. a=backout