This reverts commit 8de0e15e and
updates the goldens versoin.

This requires https://github.com/flutter/flutter/pull/20751 to
land first.