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