Reverts flutter/engine#40943 Reverting for gold diffs on https://github.com/flutter/flutter/pull/124261