backport from openshift repo