Bug 1067806 - Backed out skip changeset c53a38a762af