Revert "Changes from  comments in PR#442, in oc-project"

This reverts commit 3bf858e2a7ea154e4a00e98fe95d98153b416bbf.