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

This reverts commit 0aa9a0bc6cca948ac5a0d693cf9791fad2d99d6f.