This reverts commit 2a5aa29442.
Additionally, fix a few NNBD issues.
Fixes https://github.com/flutter/flutter/issues/70408
This reverts commit 2a5aa29442.
Additionally, fix a few NNBD issues.
Fixes https://github.com/flutter/flutter/issues/70408