…endant" (#136894)"

This reverts commit c2bd2c11.

fixes https://github.com/flutter/flutter/issues/134854

This is a straight reland, the internal test is testing a wrong behave. https://critique.corp.google.com/cl/575028981