Revert "fix CUtil::GetMatchingSource() after 7260bcce93057497d290bdb928bf8c5cf5a0ad9e"

This reverts commit 24ce994a311668ff6fbb2840230c24405dd6300a.
Revert "Revert "fix CUtil::GetMatchingSource() after 7260bcce93057497d290bdb928bf8c5cf5a0ad9e""

This reverts commit f6c2ab9d086ccd8ca07fdcf89058ff7bfb769720.
Merge remote-tracking branch 'upstream/master'