This reverts commit 890a6c8f70d2e0f45b3692d34a6df1ecb6d8335b, reversing changes made to 4f60a8d493ab9571eb328b9d98da477a50bc7446. Kubernetes-commit: 0d90d1ffa5e87dfc4d3098da7f281351c7ff1972