Revert "Rework source"

This reverts commit f993b6b17be026d0ca82dbd53c01d9c4c16740bf.