The https://github.com/paritytech/substrate/pull/10284 has been merged, so we switch back to upstream.