Revert "Refactored resolvers."

This reverts commit 5657c644cfc4b7d643043560325da4ed6d552c83.