srv-less: Brings back source fixing logic.(#1424)
Merge pull request #1425 from am11/master

srv-less: Brings back source fixing logic (#1424)