Introduced in 6.1 with #31184 the two copies of OutputStreamPublisher have some legitimate reasons to differ, but they have began to diverge beyond that, and could be more aligned to make them easier to maintain.