Backed out changeset 2d88daa2e4bc (bug 1899848) for conflicting with the backout...