Merge "Removed temporary hacks." into oc-dev