Fix bug.
Revert to old collision code.