Backed out changeset 84a0967ba12d (bug 804430)