Incorrect Drizzle 7 detection (backport from 37781045)