Revert workaround#2316

domesticmouse merged 2 commits intoflutter:mainflutter/codelabs:mainfrom

domesticmouse:revert-workarounddomesticmouse/codelabs:revert-workaroundCopy head branch name to clipboard