restored https://github.com/flutter/flutter/pull/17496 restored https://github.com/flutter/flutter/pull/17580
