Revert "remove unnecessary resolver"

This reverts commit 69d58f30c8209d5c3b7624b6c18a56e6013d5af4.