diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index 45b76d06de..b17e812688 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -2738,7 +2738,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -4575,7 +4575,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
 [[package]]
 name = "polkadot-availability-store"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "derive_more 0.99.9",
  "exit-future 0.2.0",
@@ -4602,7 +4602,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "frame-benchmarking-cli",
  "futures 0.3.5",
@@ -4625,7 +4625,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 2.0.2",
@@ -4652,7 +4652,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.7.30"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "parity-scale-codec",
  "sp-core",
@@ -4663,7 +4663,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "derive_more 0.15.0",
  "parity-scale-codec",
@@ -4676,7 +4676,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "arrayvec 0.4.12",
  "bytes 0.5.6",
@@ -4705,7 +4705,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "derive_more 0.99.9",
  "futures 0.3.5",
@@ -4726,7 +4726,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -4749,7 +4749,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "jsonrpc-core",
  "pallet-transaction-payment-rpc",
@@ -4776,7 +4776,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -4841,7 +4841,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-support",
@@ -4875,7 +4875,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-support",
@@ -4906,7 +4906,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "frame-benchmarking",
  "frame-system-rpc-runtime-api",
@@ -4966,7 +4966,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -4976,7 +4976,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -5030,7 +5030,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "futures 0.3.5",
  "pallet-timestamp",
@@ -5054,7 +5054,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.8.2"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -5101,7 +5101,7 @@ dependencies = [
 [[package]]
 name = "polkadot-validation"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "ansi_term 0.12.1",
  "bitvec",
@@ -5878,7 +5878,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -9374,7 +9374,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#bb02af4c860940c070db47a0461e1bd406e88f39"
+source = "git+https://github.com/paritytech/polkadot?branch=rococo-branch#58830aabfe9640ac773023914104ec08be9122d0"
 dependencies = [
  "bitvec",
  "frame-executive",
diff --git a/cumulus/parachain-upgrade/src/lib.rs b/cumulus/parachain-upgrade/src/lib.rs
index f73ed6c653..fc943fbfa7 100644
--- a/cumulus/parachain-upgrade/src/lib.rs
+++ b/cumulus/parachain-upgrade/src/lib.rs
@@ -43,8 +43,6 @@ use sp_core::storage::well_known_keys;
 use sp_inherents::{InherentData, InherentIdentifier, ProvideInherent};
 use sp_std::vec::Vec;
 
-/// A ValidationFunction is a compiled WASM blob which, on execution, validates parachain blocks.
-pub type ValidationFunction = Vec<u8>;
 type System<T> = frame_system::Module<T>;
 
 /// The pallet's configuration trait.
@@ -64,7 +62,7 @@ decl_storage! {
 		// we need to store the new validation function for the span between
 		// setting it and applying it.
 		PendingValidationFunction get(fn new_validation_function):
-			Option<(RelayChainBlockNumber, ValidationFunction)>;
+			Option<(RelayChainBlockNumber, Vec<u8>)>;
 
 		/// Were the VFPs updated this block?
 		DidUpdateVFPs: bool;
@@ -80,7 +78,7 @@ decl_module! {
 
 		// TODO: figure out a better weight than this
 		#[weight = (0, DispatchClass::Operational)]
-		pub fn schedule_upgrade(origin, validation_function: ValidationFunction) {
+		pub fn schedule_upgrade(origin, validation_function: Vec<u8>) {
 			// TODO: in the future, we can't rely on a superuser existing
 			// on-chain who can just wave their hands and make this happen.
 			// Instead, this should hook into the democracy pallet and check