Replaced two internal constants used by openshift that cannot be removed at this time