Conditional inclusion / workaround of Openshift bug