1 files changed, 6 insertions, 5 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index d5601fad..36172b5e 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -226,11 +226,12 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                                 value = value.Replace("$(", "$$(");
 
                                                 // escape things that look like wix variables
-                                                var matches = Common.WixVariableRegex.Matches(value);
-                                                for (var j = matches.Count - 1; 0 <= j; j--)
-                                                {
-                                                    value = value.Insert(matches[j].Index, "!");
-                                                }
+                                                // TODO: Evaluate this requirement.
+                                                //var matches = Common.WixVariableRegex.Matches(value);
+                                                //for (var j = matches.Count - 1; 0 <= j; j--)
+                                                //{
+                                                //    value = value.Insert(matches[j].Index, "!");
+                                                //}
 
                                                 row[i] = value;
                                                 break;