Reverted to state before OpenShift fiasco.