Issue #3376927 by catch, lauriii, longwave: Remove even more of the aggregate stale file threshold and state entry
mentioned in commit a6ba4811