Reverted changes to how collision type is determined. Need the data in type to resolve collisions