Attaching a patch. Doesn't change tests for the reasons mentioned above.
Leaves idle, 2-to-3, and mocking for their respective module maintainers to deal with holistically (as part of their routine maintenance).