Fixes part of https://github.com/kubernetes/kubernetes/issues/44976 Signed-off-by: Mrunal Patel <mrunalp@gmail.com>