diff --git a/src/cmd/7g/ggen.go b/src/cmd/7g/ggen.go
index 94685d7fce..86772d73ab 100644
--- a/src/cmd/7g/ggen.go
+++ b/src/cmd/7g/ggen.go
@@ -400,9 +400,9 @@ func clearfat(nl *gc.Node) {
 	w := uint64(uint64(nl.Type.Width))
 
 	// Avoid taking the address for simple enough types.
-	//if gc.Componentgen(nil, nl) {
-	//	return
-	//}
+	if gc.Componentgen(nil, nl) {
+		return
+	}
 
 	c := uint64(w % 8) // bytes
 	q := uint64(w / 8) // dwords