Backed out changeset 6ceb34e525f4 (bug 1888975) for causing bc failures @ toolkit...