Fix broken main

Looks like something went wrong with the 16.6.1 release, or rather the merge of 16-6-stable back into main.

I'm not sure if this is supposed to happen but all the new (since 16.6.0) commits from 16-6-stable were merged back into main, including the merge commit for !4488 (merged):

• original merge commit c0cd6b7f
• merge commit from 16-6-stable 66da9072

Note that the diff context is slightly different for each! This is because !4488 (merged) was merged into main AFTER !4325 (merged), and the latter included as diff context from the former. But, the former was not cherry picked into the 16-6-stable branch. So, the cherry pick triggered a merge conflict, there resolution of which required dropping the relevant context from !4325 (merged). And when 66da9072 merged back into main, it effectively removed part of !4325 (merged).

This commit adds back that dropped diff context to fix main. We still should investigate why/how this happened, and if either:

• i handled the cherry pick merge conflict incorrectly, or
• there's a bug in the releaser tool.