Fixes https://github.com/paritytech/polkadot-sdk/issues/7664

The discussion in https://github.com/paritytech/polkadot-sdk/pull/7710
should provide the context for why this solution was picked.

---------

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>