Revert 2 opal fixes that are no longer relevant