This reverts commit 75453e6a because it breaks flutter/test/rendering/editable_test.dart

Landing on red to fix the build.