diff --git a/CHANGELOG.md b/CHANGELOG.md
index 188f78b68..94d2254c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
     [GH-8342]
 * builder/hyperone: Update builder schema and tags [GH-8444]
 * builder/qemu: Add display template option for qemu. [GH-7676]
+* builder/qemu: Disk Size is now read as a string to support units. [GH-8320]
+    [GH-7546]
 * builder/qemu: Add fixer to convert disk size from int to string [GH-8390]
 * builder/qemu: Disk Size is now read as a string to support units. [GH-8320]
     [GH-7546]
diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go
index c9b57a2ae..cd0a32ff0 100644
--- a/provisioner/chef-client/provisioner.go
+++ b/provisioner/chef-client/provisioner.go
@@ -125,8 +125,6 @@ type KnifeTemplate struct {
 func (p *Provisioner) ConfigSpec() hcldec.ObjectSpec { return p.config.FlatMapstructure().HCL2Spec() }
 
 func (p *Provisioner) Prepare(raws ...interface{}) error {
-	// Create passthrough for build-generated data
-	p.config.ctx.Data = packer.BasicPlaceholderData()
 	err := config.Decode(&p.config, &config.DecodeOpts{
 		Interpolate:        true,
 		InterpolateContext: &p.config.ctx,
diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go
index eb2383c5e..679f99c13 100644
--- a/provisioner/powershell/provisioner.go
+++ b/provisioner/powershell/provisioner.go
@@ -91,9 +91,6 @@ func (p *Provisioner) defaultExecuteCommand() string {
 func (p *Provisioner) ConfigSpec() hcldec.ObjectSpec { return p.config.FlatMapstructure().HCL2Spec() }
 
 func (p *Provisioner) Prepare(raws ...interface{}) error {
-	// Create passthrough for build-generated data
-	p.config.ctx.Data = packer.BasicPlaceholderData()
-
 	err := config.Decode(&p.config, &config.DecodeOpts{
 		Interpolate:        true,
 		InterpolateContext: &p.config.ctx,
diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go
index 3ec2c013f..4e62e842d 100644
--- a/provisioner/puppet-masterless/provisioner.go
+++ b/provisioner/puppet-masterless/provisioner.go
@@ -154,8 +154,6 @@ type EnvVarsTemplate struct {
 func (p *Provisioner) ConfigSpec() hcldec.ObjectSpec { return p.config.FlatMapstructure().HCL2Spec() }
 
 func (p *Provisioner) Prepare(raws ...interface{}) error {
-	// Create passthrough for build-generated data
-	p.config.ctx.Data = packer.BasicPlaceholderData()
 	err := config.Decode(&p.config, &config.DecodeOpts{
 		Interpolate:        true,
 		InterpolateContext: &p.config.ctx,
diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go
index 9468638f0..71826831b 100644
--- a/provisioner/puppet-server/provisioner.go
+++ b/provisioner/puppet-server/provisioner.go
@@ -148,9 +148,6 @@ type EnvVarsTemplate struct {
 func (p *Provisioner) ConfigSpec() hcldec.ObjectSpec { return p.config.FlatMapstructure().HCL2Spec() }
 
 func (p *Provisioner) Prepare(raws ...interface{}) error {
-	// Create passthrough for build-generated data
-	p.config.ctx.Data = packer.BasicPlaceholderData()
-
 	err := config.Decode(&p.config, &config.DecodeOpts{
 		Interpolate:        true,
 		InterpolateContext: &p.config.ctx,