Replaced the hackfix for MSBuildCombine with proper fix