
This reverts commit 67cf7918cfc9201cfc05f508278a3ab6571bbb8e. Reverting because this causes scuba regressions that I'd like to address in another PR that is pending, but we'd like to roll Flutter.
This reverts commit 67cf7918cfc9201cfc05f508278a3ab6571bbb8e. Reverting because this causes scuba regressions that I'd like to address in another PR that is pending, but we'd like to roll Flutter.