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