diff --git a/pkg/await/await.go b/pkg/await/await.go
index 854c115e0c..be9d86a26e 100644
--- a/pkg/await/await.go
+++ b/pkg/await/await.go
@@ -325,14 +325,15 @@ func Deletion(
 		version = client.DefaultVersion()
 	}
 
+	// Manually set delete propagation for Kubernetes versions < 1.6 to avoid bugs.
 	deleteOpts := metav1.DeleteOptions{}
 	if version.Compare(1, 6) < 0 {
 		// 1.5.x option.
 		boolFalse := false
 		// nolint
 		deleteOpts.OrphanDependents = &boolFalse
-	} else {
-		// 1.6.x option. (NOTE: Background delete propagation is broken in k8s v1.6, and maybe later.)
+	} else if version.Compare(1, 7) < 0 {
+		// 1.6.x option. Background delete propagation is broken in k8s v1.6.
 		fg := metav1.DeletePropagationForeground
 		deleteOpts.PropagationPolicy = &fg
 	}