Revert "added some usage of the conditional_sources functions"

This reverts commit 4a1d698c6dd4b3ff838ed32300d36af75bb3bdff.