Revert workaround for UNIVERSAL::isa bug