Backing out changeset 38f2f14483ec from bug 913113.