Revert unneeded modifications to Cursor and OdtCursor