Revert "bb#11185 - candidate fix to version mismatch when using vpaths"

This reverts commit 26a9128a4b7033299152307737d77a8a76310a4a.
autojunk'd