Revert topic

Somehow VS6 causes problems.
Merge topic 'target-transitive-sources' into next

dacf57e3 Revert topic