Revert "virtual inheritance"

This reverts commit adfd760bfc58be1544a8236f25e4aca86488b105.