Backed out changeset b77de3bb419e (bug 994954)