(Merge 3.3) Issue #17429: Oops, remove unused import