Tweaked for Openshift Origin