Revert "Merge branch 'html-escaping-edit' into vim"

This reverts commit c4932dc9266a5766e7f607b8243dc0ba0bb5e883, reversing
changes made to 5d36f97ff4876c6805c201c2d7861ebc23487b47.