This reverts commit fcc4ab32301396986dd5103d6d444bff35fe0f63. Fixes https://github.com/flutter/flutter/issues/41394 and other related correctness issues. TBR: @arbreng @jason-simmons @mehmetf