This reverts commit eba5b6092a. Fixes https://github.com/kubernetes/kubernetes/issues/57526
eba5b6092a