Swapped To Old Detector
Merge remote-tracking branch 'origin/Collision-Detector-Revert' into Bug-Fixes