We need an 8.0 or better for the CI job (and, y'know, code readability/maintainability), please fix without changing functionality