Backout changeset c01dea53dd60, r=faulty