Revert "Fix bad ref to srcpath"

This reverts commit 39b98a35e4014faf1cffe5e7c3f3ff178aee4b93.
Revert "Merge pull request #6573 from erchn/develop"

This reverts commit 3e1df4f901a359e2177825b438563f31886681dc, reversing
changes made to 9f2018fff435787a8e0b6dc3f93496e0fd1de4db.