diff --git a/main.go b/main.go
index 060bf1227..a38db8e6d 100644
--- a/main.go
+++ b/main.go
@@ -326,67 +326,67 @@ func loadConfig() (*config, error) {
 		// BuilderRedirects
 		BuilderRedirects: map[string]string{
 
-			//"amazon-chroot":       "github.com/hashicorp/amazon",
-			//"amazon-ebs":          "github.com/hashicorp/amazon",
-			//"amazon-ebssurrogate": "github.com/hashicorp/amazon",
-			//"amazon-ebsvolume":    "github.com/hashicorp/amazon",
-			//"amazon-instance":     "github.com/hashicorp/amazon",
+			"amazon-chroot":       "github.com/hashicorp/amazon",
+			"amazon-ebs":          "github.com/hashicorp/amazon",
+			"amazon-ebssurrogate": "github.com/hashicorp/amazon",
+			"amazon-ebsvolume":    "github.com/hashicorp/amazon",
+			"amazon-instance":     "github.com/hashicorp/amazon",
 
-			//"azure-arm":    "github.com/hashicorp/azure",
-			//"azure-chroot": "github.com/hashicorp/azure",
-			//"azure-dtl":    "github.com/hashicorp/azure",
+			"azure-arm":    "github.com/hashicorp/azure",
+			"azure-chroot": "github.com/hashicorp/azure",
+			"azure-dtl":    "github.com/hashicorp/azure",
 
-			//"docker": "github.com/hashicorp/docker",
+			"docker": "github.com/hashicorp/docker",
 
-			//"exoscale": "github.com/exoscale/exoscale",
+			"exoscale": "github.com/exoscale/exoscale",
 
-			//"googlecompute": "github.com/hashicorp/googlecompute",
+			"googlecompute": "github.com/hashicorp/googlecompute",
 
-			//"parallels-iso": "github.com/hashicorp/parallels",
-			//"parallels-pvm": "github.com/hashicorp/parallels",
+			"parallels-iso": "github.com/hashicorp/parallels",
+			"parallels-pvm": "github.com/hashicorp/parallels",
 
-			//"qemu": "github.com/hashicorp/qemu",
+			"qemu": "github.com/hashicorp/qemu",
 
-			//"vagrant": "github.com/hashicorp/vagrant",
+			"vagrant": "github.com/hashicorp/vagrant",
 
-			//"virtualbox-iso": "github.com/hashicorp/virtualbox",
-			//"virtualbox-ovf": "github.com/hashicorp/virtualbox",
-			//"virtualbox-vm":  "github.com/hashicorp/virtualbox",
+			"virtualbox-iso": "github.com/hashicorp/virtualbox",
+			"virtualbox-ovf": "github.com/hashicorp/virtualbox",
+			"virtualbox-vm":  "github.com/hashicorp/virtualbox",
 
-			//"vmware-iso": "github.com/hashicorp/vmware",
-			//"vmware-vmx": "github.com/hashicorp/vmware",
+			"vmware-iso": "github.com/hashicorp/vmware",
+			"vmware-vmx": "github.com/hashicorp/vmware",
 
-			//"vsphere-iso":   "github.com/hashicorp/vsphere",
-			//"vsphere-clone": "github.com/hashicorp/vsphere",
+			"vsphere-iso":   "github.com/hashicorp/vsphere",
+			"vsphere-clone": "github.com/hashicorp/vsphere",
 		},
 		DatasourceRedirects: map[string]string{
-			//"amazon-ami":            "github.com/hashicorp/amazon",
-			//"amazon-secretsmanager": "github.com/hashicorp/amazon",
+			"amazon-ami":            "github.com/hashicorp/amazon",
+			"amazon-secretsmanager": "github.com/hashicorp/amazon",
 		},
 		ProvisionerRedirects: map[string]string{
-			//"ansible":       "github.com/hashicorp/ansible",
-			//"ansible-local": "github.com/hashicorp/ansible",
+			"ansible":       "github.com/hashicorp/ansible",
+			"ansible-local": "github.com/hashicorp/ansible",
 
-			//"azure-dtlartifact": "github.com/hashicorp/azure",
+			"azure-dtlartifact": "github.com/hashicorp/azure",
 		},
 		PostProcessorRedirects: map[string]string{
-			//"amazon-import": "github.com/hashicorp/amazon",
+			"amazon-import": "github.com/hashicorp/amazon",
 
-			//"docker-import": "github.com/hashicorp/docker",
-			//"docker-push":   "github.com/hashicorp/docker",
-			//"docker-save":   "github.com/hashicorp/docker",
-			//"docker-tag":    "github.com/hashicorp/docker",
+			"docker-import": "github.com/hashicorp/docker",
+			"docker-push":   "github.com/hashicorp/docker",
+			"docker-save":   "github.com/hashicorp/docker",
+			"docker-tag":    "github.com/hashicorp/docker",
 
-			//"googlecompute-export": "github.com/hashicorp/googlecompute",
-			//"googlecompute-import": "github.com/hashicorp/googlecompute",
+			"googlecompute-export": "github.com/hashicorp/googlecompute",
+			"googlecompute-import": "github.com/hashicorp/googlecompute",
 
-			//"exoscale-import": "github.com/exoscale/exoscale",
+			"exoscale-import": "github.com/exoscale/exoscale",
 
-			//"vagrant":       "github.com/hashicorp/vagrant",
-			//"vagrant-cloud": "github.com/hashicorp/vagrant",
+			"vagrant":       "github.com/hashicorp/vagrant",
+			"vagrant-cloud": "github.com/hashicorp/vagrant",
 
-			//"vsphere":          "github.com/hashicorp/vsphere",
-			//"vsphere-template": "github.com/hashicorp/vsphere",
+			"vsphere":          "github.com/hashicorp/vsphere",
+			"vsphere-template": "github.com/hashicorp/vsphere",
 		},
 	}
 	if err := config.Plugins.Discover(); err != nil {