diff --git a/daemon/inspect.go b/daemon/inspect.go
index 0cd20ee977..3abc7f9f1d 100644
--- a/daemon/inspect.go
+++ b/daemon/inspect.go
@@ -106,21 +106,17 @@ func (daemon *Daemon) containerInspect120(name string) (*v1p20.ContainerJSON, er
 		return nil, err
 	}
 
-	mountPoints := ctr.GetMountPoints()
-	config := &v1p20.ContainerConfig{
-		Config:          ctr.Config,
-		MacAddress:      ctr.Config.MacAddress,
-		NetworkDisabled: ctr.Config.NetworkDisabled,
-		ExposedPorts:    ctr.Config.ExposedPorts,
-		VolumeDriver:    ctr.HostConfig.VolumeDriver,
-	}
-	networkSettings := daemon.getBackwardsCompatibleNetworkSettings(ctr.NetworkSettings)
-
 	return &v1p20.ContainerJSON{
 		ContainerJSONBase: base,
-		Mounts:            mountPoints,
-		Config:            config,
-		NetworkSettings:   networkSettings,
+		Mounts:            ctr.GetMountPoints(),
+		Config: &v1p20.ContainerConfig{
+			Config:          ctr.Config,
+			MacAddress:      ctr.Config.MacAddress,
+			NetworkDisabled: ctr.Config.NetworkDisabled,
+			ExposedPorts:    ctr.Config.ExposedPorts,
+			VolumeDriver:    ctr.HostConfig.VolumeDriver,
+		},
+		NetworkSettings: daemon.getBackwardsCompatibleNetworkSettings(ctr.NetworkSettings),
 	}, nil
 }
 
diff --git a/daemon/inspect_linux.go b/daemon/inspect_linux.go
index 9c2c513d0e..1b38ec60c9 100644
--- a/daemon/inspect_linux.go
+++ b/daemon/inspect_linux.go
@@ -39,25 +39,22 @@ func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON,
 		volumesRW[m.Destination] = m.RW
 	}
 
-	config := &v1p19.ContainerConfig{
-		Config:          ctr.Config,
-		MacAddress:      ctr.Config.MacAddress,
-		NetworkDisabled: ctr.Config.NetworkDisabled,
-		ExposedPorts:    ctr.Config.ExposedPorts,
-		VolumeDriver:    ctr.HostConfig.VolumeDriver,
-		Memory:          ctr.HostConfig.Memory,
-		MemorySwap:      ctr.HostConfig.MemorySwap,
-		CPUShares:       ctr.HostConfig.CPUShares,
-		CPUSet:          ctr.HostConfig.CpusetCpus,
-	}
-	networkSettings := daemon.getBackwardsCompatibleNetworkSettings(ctr.NetworkSettings)
-
 	return &v1p19.ContainerJSON{
 		ContainerJSONBase: base,
 		Volumes:           volumes,
 		VolumesRW:         volumesRW,
-		Config:            config,
-		NetworkSettings:   networkSettings,
+		Config: &v1p19.ContainerConfig{
+			Config:          ctr.Config,
+			MacAddress:      ctr.Config.MacAddress,
+			NetworkDisabled: ctr.Config.NetworkDisabled,
+			ExposedPorts:    ctr.Config.ExposedPorts,
+			VolumeDriver:    ctr.HostConfig.VolumeDriver,
+			Memory:          ctr.HostConfig.Memory,
+			MemorySwap:      ctr.HostConfig.MemorySwap,
+			CPUShares:       ctr.HostConfig.CPUShares,
+			CPUSet:          ctr.HostConfig.CpusetCpus,
+		},
+		NetworkSettings: daemon.getBackwardsCompatibleNetworkSettings(ctr.NetworkSettings),
 	}, nil
 }