Reverts flutter/flutter#153752 Relands https://github.com/flutter/flutter/pull/150850 Now with attached g3fix