diff --git a/src/GitInfo/build/GitInfo.AssemblyMetadata.targets b/src/GitInfo/build/GitInfo.AssemblyMetadata.targets
index ae852d6..f5a5461 100644
--- a/src/GitInfo/build/GitInfo.AssemblyMetadata.targets
+++ b/src/GitInfo/build/GitInfo.AssemblyMetadata.targets
@@ -10,12 +10,7 @@
 	==============================================================
 	-->
 
-  <PropertyGroup>
-    <GitThisAssemblyMetadata Condition="'$(GitThisAssemblyMetadata)' == ''">false</GitThisAssemblyMetadata>
-  </PropertyGroup>
-
-  <Target Name="GitAssemblyMetadata" DependsOnTargets="GitInfo;GitVersion"
-          BeforeTargets="BuildOnlySettings" Condition="'$(GitThisAssemblyMetadata)' == 'true'">
+  <Target Name="GitAssemblyMetadata" DependsOnTargets="GitInfo;GitVersion" BeforeTargets="BuildOnlySettings">
 
     <ItemGroup Condition="'$(Language)' != 'VB'">
       <AssemblyMetadata Include="GitInfo.IsDirty"
diff --git a/src/GitInfo/build/GitInfo.targets b/src/GitInfo/build/GitInfo.targets
index a94c01a..943f940 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -1074,9 +1074,12 @@
     </PropertyGroup>
   </Target>
 
-  <Import Project="GitInfo.AssemblyInfo.targets"/>
-  <Import Project="GitInfo.AssemblyMetadata.targets" Condition="'$(Language)' != 'C#' or '$(ThisAssemblyNamespace)' != ''"/>
-  <Import Project="GitInfo.ThisAssembly.targets" Condition="'$(Language)' == 'C#'"/>
+  <Import Project="GitInfo.AssemblyMetadata.targets" Condition="'$(GitThisAssemblyMetadata)' == 'true'"/>
+
+  <!-- Legacy generation in place for non-C# or when the unsupported ThisAssemblyNamespace is in use -->
+  <Import Project="GitInfo.AssemblyInfo.targets" Condition="'$(Language)' != 'C#' or '$(ThisAssemblyNamespace)' != ''"/>
+  <!-- Otherwise, for C# we always use ThisAssembly instead. -->
+  <Import Project="GitInfo.ThisAssembly.targets" Condition="'$(Language)' == 'C#' and '$(ThisAssemblyNamespace)' == ''"/>
 
   <PropertyGroup>
     <GitInfoImported>true</GitInfoImported>