Revert "another attempt at fixing oc"

This reverts commit 5a1b3c9faf07d6922e7ed7008410facdb6d0ac45.