Fix #21030#21049

pranavmanglik wants to merge 2 commits intopython:masterpython/mypy:masterfrom

pranavmanglik:masterpranavmanglik/mypy:masterCopy head branch name to clipboard