Revert "inheritance handling"

This reverts commit b216cf2ce5ee29c8d1ec1e4f4ac884cc955ee7c1.