Reverts f0eb015 The conflicts are not resolved. This also breaks propagated edits on visual line + I/A. A more convoluted fix is needed. Relevant to #2447
f0eb015