Backed out changeset 074b8a59783f (bug 1891509) for causing fenix lint failures....