Revert "resolve aliases before passing the hash to the predicate builder"

This reverts commit 8b9f16fcb350006a8e903bd52be04f30ae8b8d89.