Revert topic.
Merge topic 'target-sources-refactor' into next

daf00de1 Revert topic.