Backed out changeset 26904179b913 (bug 1832022) for causing multiple crashes related...