Backed out changeset 6ba32a1a0cb7 (bug 1874665) for linting opt failures.