Backed out changeset 80f21c20d24d (bug 1840537) for causing problems when running e.g. mach lint CLOSED TREE