this is a manual reversion of #20702
this is a manual reversion of #20702

I can't revert with github which says "Sorry, this pull request couldn’t be
reverted automatically. It may have already been reverted, or the content may
have changed since it was merged."

Reverts commit: 0c191e787b9aefe47df256e35a41877d81bdf321

Kubernetes-commit: b1743a688727f96571327a5173b420c06cabe1a0

kubernetes/api