Polkadot companion for #8043 (#2382)

* WIP

* WIP

* WIP

* Revert branch change

* CLEANUP

* "Update Substrate"

* Fix build

* Revert "Fix build"

This reverts commit 2dcc3f2a.

* cargo update -p sp-io

Co-authored-by: parity-processbot <>