diff --git a/terraform/eval_apply.go b/terraform/eval_apply.go
index 49cfe80f2..1d766cda8 100644
--- a/terraform/eval_apply.go
+++ b/terraform/eval_apply.go
@@ -203,12 +203,6 @@ func (n *EvalApply) Eval(ctx EvalContext) (interface{}, error) {
 				// on the planned value, and thus get a different result during the
 				// apply phase. This will usually lead to a "Provider produced invalid plan"
 				// error that incorrectly blames the downstream resource for the change.
-				//
-				// TODO: Ideally we should use objchange.NormalizeObjectFromLegacySDK
-				// here so the rest of Terraform is shielded from some of the oddities
-				// of the legacy SDK, but for the moment we've done that only in
-				// format.ResourceChange to reduce the risk of unexpected impacts
-				// elsewhere.
 
 			} else {
 				for _, err := range errs {
diff --git a/terraform/eval_diff.go b/terraform/eval_diff.go
index 88a142dfd..461a0b508 100644
--- a/terraform/eval_diff.go
+++ b/terraform/eval_diff.go
@@ -229,12 +229,6 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) {
 				fmt.Fprintf(&buf, "\n      - %s", tfdiags.FormatError(err))
 			}
 			log.Print(buf.String())
-
-			// TODO: Ideally we should use objchange.NormalizeObjectFromLegacySDK
-			// here so the rest of Terraform is shielded from some of the oddities
-			// of the legacy SDK, but for the moment we've done that only in
-			// format.ResourceChange to reduce the risk of unexpected impacts
-			// elsewhere.
 		} else {
 			for _, err := range errs {
 				diags = diags.Append(tfdiags.Sourceless(