Reverting back resets for the cursor. It introduced a regression