Revert "Updated OC/UC/UV/OV interface"

This reverts commit d340975247f76eed2e99801aa57c6ba7a4c6a9d6.