This had silently regressed due to 81860281 and the variable renaming performed in b55ee979, as noted in #17374.