Revert "check for interface instead of concrete type"

This reverts commit ae276c2e75e89c06f2bf6a96025c206cbffe059e.
Revert "check for interface instead of concrete type"

This reverts commit ec1026a8c257e0ff45bc6b16733d7a4cc18e38df.