Remove self.__class__ cleverness :/