Fixed catastrophic repercussions of earlier collision code changes.
Implemented a different workaround to (hopefully) preserve the fix from
before.