Revert "Using unwrappedResultType for the proxied class"

This reverts commit 9bd97f0c27518d14247e9fbfb95677e8a2f50424.