This reverts commit 75494c08b4, which must await a fix to ITS#7771 (DUPSORT cursor tracking).
75494c08b4