This reverts commit d00fbd7025. Reverting because, it caused a failure during v1.45.3 publish: 2777371809
d00fbd7025
2777371809