Revert "Improve the detection of the extracted source."

This improves the detection of the extracted source.

This reverts commit 3eff72ba89e4e4ac9670a189b6f290ddc84c113e.

Relevant to #81