diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 40547fe2e0d91749ae7d480469f145820a3a1779..f79a1220f2bf5c4e6affc989b9f2e24e64266812 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -182,14 +182,6 @@ void bl31_prepare_next_image_entry()
 				(MODE_RW_64 << MODE_RW_SHIFT))
 		scr |= SCR_RW_BIT;
 
-	/*
-	 * Setup general purpose registers context for next image.
-	 */
-	cpu_context_t *context = cm_get_context(read_mpidr(),
-					next_image_info->security_state);
-	memcpy(&context->gpregs_ctx, &next_image_info->args,
-					sizeof(next_image_info->args));
-
 	/*
 	 * Tell the context mgmt. library to ensure that SP_EL3 points to
 	 * the right context to exit from EL3 correctly.
diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c
index b16ef05f0cd75aae18d4d2117edd3dc63313d9f2..94ba8065b1d967829d2906b2aecc8d5d67efd905 100644
--- a/plat/juno/bl31_plat_setup.c
+++ b/plat/juno/bl31_plat_setup.c
@@ -114,8 +114,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
 
 	bl2_to_bl31_params = from_bl2;
 
-	/* UEFI expects x0 to be primary CPU MPID */
-	bl2_to_bl31_args.bl33_image_info.args.arg0 = PRIMARY_CPU;
 }
 
 /*******************************************************************************