Backed out the changes that wrap species behavior pointers in void-ps.