Restore the existing source root directory

Related to #2449
Merge branch 'disable-source-root'