Repeat r361567 for a few more tools.
For future reference, obvious follow ups like this are fine for post-commit review