Merge change 53

* changes:
  Revert "Changes required to accommodate OpenCORE 2.0"