This reverts commit a44f174e. Reason: start_up tests become flaky. See https://github.com/flutter/flutter/issues/28374 TBR: xster Merge on red to fix the tree
