Fix for issue 618
This change is
Can one of the admins verify this patch?
Not an admin, but I can confirm this patch works for me on Kubernetes v1.16.3.