Revert "Fixes issue with wrong inheritance order"

This reverts commit 409ce65537e993b5ee28f3bbc34ca557a9f53125.