Revert "COLLISION"

This reverts commit 06a83c44f417a1a35393b564e83472dcb012cd13.