Revert the fix, we can't use ops without this ugly hack