This reverts commit 8acc058c.

Reverts #25483

Reason for revert: it seems to break the flutter_gallery_instrumentation_test post-submit test.

TBR: @sbaranov