This reverts commit f2d2383aee. https://github.com/flutter/engine/pull/7759 has landed without any unexpected regressions. Hence we'll reland this as planned.
f2d2383aee