This PR is a reminder to handle the comment of @saad-ali on https://github.com/kubernetes/kubernetes/pull/45346#issuecomment-302270624 I most likely won't be able to do this by myself due to missing time.