Revert class inheritance...