diff --git a/cc/sanitize.go b/cc/sanitize.go
index 881a5a01f..de970352e 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -256,9 +256,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
 		s.Diag.Cfi = nil
 	}
 
-	// Also disable CFI for VNDK variants of components in the
-	// include paths
-	if ctx.isVndk() && ctx.useVndk() && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
+	// Also disable CFI for VNDK variants of components
+	if ctx.isVndk() && ctx.useVndk() {
 		s.Cfi = nil
 		s.Diag.Cfi = nil
 	}