Revert cursors to v2.3.0 behavior