Reverts flutter/flutter#128507

This PR caused some internal failures (Google internal link b/286503764). Will need to investigate before we can re-land these changes.