Backed out changeset 88e6ff26733f (bug 916134).