this one was a little more difficult because it needs a patch, there's
something wonky with the definition order
fwiw, the upstream cvs repository ... server errors.
Change-Id: I2d99359edec36b578389f1be1fcf077743c29c4e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4342
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
