Reverts flutter/flutter#131368
Original PR: https://github.com/flutter/flutter/pull/131292 . The
flutter mirror was out of date and tree was closed, so the original PR
was reverted. Now should be safe to have a reland.