Revert "Merge pull request #6 from th7/feature/source_from_query"

This reverts commit 7967bb815caf87b2fe904ba6bab902a89ec13e23, reversing
changes made to 2bb0de8b9c182f605edc9d7ff9d6bca49c503256.