This reverts commit 9874561f39. See bug#67990. Basically our original code is correct, the error is in libtree-sitter, which only manifests in certain cases. https://github.com/tree-sitter/tree-sitter/pull/2104
9874561f39