Tested in 5868. Fixes the problem reported and seen in Workspaces and other ParagraphEditors. I'm not sure about what case is supposed to still be broken, though.