backing out Species removal added from bug 158.  It swaps the order of the Species and affects perf
backing out Species removal added from bug 158.  It swaps the order of the Species and affects perf

etomica/etomica,etomica/etomica,ajschult/etomica,etomica/etomica,ajschult/etomica,ajschult/etomica