Fixup the oce.cmake now that the patch is integrated

Also delete the patch since we don't need it