This reverts commit 5a59a43957c6743995dac67fdda42bf8e0a9ca77, reversing changes made to 81b9789eaa7bc067f417b5e74d5695dd6dd88a46. Kubernetes-commit: 892d4fabb845e2461e3655aa414beb6ac322fc99