Revert "Fix check for appdata- and desktop-file-validate"

This reverts commit 95fb81ca021abfb281ed88f56d04f32b006a36ad.
Use smarter check for *-validate