When merging the two backports (#4194 and #4656) for the broker pallet,
the priority of the changes seems to have been reversed and ended up
with some broken code.

CI doesn't actually run before merging on these release branches so it
merged with broken tests. `release-` branches are protected so it needs
this PR to remove the duplication. Sorry for the noise.