Revert "Some Updates for collision wrappers need testing =)"

This reverts commit 7d62480ad9c56a53b30b15e28750f7f4379d1ae6.

Signed-off-by: Salja <salja8840@gmail.com>