Restore compatibility with the Flutter tool (#1592)

Fixes #1591
7 files changed