Remove code path for source dependent separation. For real this time
We forgot to merge a PR apparently. This times source dependent features are actually removed.
We forgot to merge a PR apparently. This times source dependent features are actually removed.