revert inherits support related change