Revert "oc fixes"

This reverts commit a30f65605c3f3d982632f5cea8026aa44a7996e9.