Since master has now finally bumped to staging, the diff in the mentioned
Rietveld review is accurate and up to date.

Putting this back to Patch-new. I'll run patchy myself in parallel to see
whether it picks up any old crud by mistake: the last patchy failure should
have been because of _different_ reasons, so something definitely is fishy
here.