Fix F821 false negatives when from __future__ import annotations is active (attempt 2)

Fix F821 false negatives when from __future__ import annotations is active (attempt 2) #26077