Changed CollisionHandler back to original system

Tomorrow is the day of testing.