Revert "Add fix for inheritance problem."

This reverts commit c437462db717bdf4f9f4098b3ad7ea185de74967.