revert some stuff

Author: Rich-Harris

packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js

@@ -96,7 +96,6 @@ export function CallExpression(node, context) {
 			}
 
 			context.state.analysis.props_id = parent.id;
-			context.state.analysis.needs_context = true;
 
 			break;
 		}

packages/svelte/src/compiler/phases/3-transform/client/transform-client.js

@@ -398,13 +398,7 @@ export function client_component(analysis, options) {
 
 	// we want the cleanup function for the stores to run as the very last thing
 	// so that it can effectively clean up the store subscription even after the user effects runs
-	// if we have $props.id `should_inject_context` will always be true
 	if (should_inject_context) {
-		// we need to put the `$props.id` after the `$.push` because the `component_context` will be properly initialized
-		if (analysis.props_id) {
-			// need to be placed on first line of the component for hydration
-			component_block.body.unshift(b.const(analysis.props_id, b.call('$.props_id')));
-		}
 		component_block.body.unshift(b.stmt(b.call('$.push', ...push_args)));
 
 		let to_push;
@@ -568,6 +562,11 @@ export function client_component(analysis, options) {
 		component_block.body.unshift(b.stmt(b.call('$.check_target', b.id('new.target'))));
 	}
 
+	if (analysis.props_id) {
+		// need to be placed on first line of the component for hydration
+		component_block.body.unshift(b.const(analysis.props_id, b.call('$.props_id')));
+	}
+
 	if (state.events.size > 0) {
 		body.push(
 			b.stmt(b.call('$.delegate', b.array(Array.from(state.events).map((name) => b.literal(name)))))

packages/svelte/src/internal/client/render.js

@@ -212,9 +212,7 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 			if (context) {
 				push({});
 				var ctx = /** @type {ComponentContext} */ (component_context);
-				if (context) {
-					ctx.c = context;
-				}
+				ctx.c = context;
 			}
 
 			if (events) {