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