This reverts commit e7061698147e80fa53ec3ed0cf048f4d68df7d68. This causes preview-dart-2 test failures.