Fix #5948: Be more careful with capturing #5957
+389
−138
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.