diff --git a/scripts/99_terraform.sh b/scripts/99_terraform.sh
index 786abf7..1eee47e 100755
--- a/scripts/99_terraform.sh
+++ b/scripts/99_terraform.sh
@@ -4,7 +4,7 @@ set -xueo pipefail
 source "$(dirname $0)/utils.sh"
 goto_root
 
-for path in $(find "$(get_scope $1)" -name 'inputs.tf' -print); do
+for path in $(find "$(get_scope $1)" -name 'inputs.tf' -print); do 
     dir=$(dirname ${path})
     cat <<EOF > ${dir}/tmp.tf
 provider "datadog" {
@@ -31,11 +31,7 @@ EOF
     terraform init ${dir}
     terraform validate ${dir}
     rm -f ${dir}/tmp.tf
-    # hack to work around bug https://github.com/hashicorp/terraform/issues/21434
-    # TODO when fixed, remove this bloc and add "terraform fmt -recursive" to the end of this file
-    for file in $(grep ' = <<E' ${dir}/* | cut -d':' -f1 | sort | uniq); do
-        sed -Ei '/<<EO(Q|F)/,/EO(Q|F)/ s/^#*/#/' ${file}
-        terraform fmt ${dir}
-        sed -Ei '/<<EO(Q|F)/,/EO(Q|F)/ s/^[[:space:]]*#//' ${file}
-    done
 done
+
+terraform fmt -recursive
+