Merge pull request #11060 from codyrancher/normalize-removal #1

Job	Run time
Build Test / i18n	1m 14s
Build Test / lint	2m 6s
Build Test / unit-test	2m 51s
Build and Upload / Build & Upload Hosted	3m 19s
Build and Upload / Build & Upload Embedded	3m 26s
	12m 56s

Provide feedback