Backed out changeset ef8248e892e0 (bug 891110)