This edit (and line 944 & 957) are no longer necessary. This was introduced when the state was recorded from the recent operation, rather than the persisted state on the cursor.