This reverts commit adc8e159. This should be safe to land once https://github.com/flutter/flutter/pull/28530 gets merged Merge on yellow doc test because the doc test is actually green.
