Revert "Bunny/Clyde Collision fixes"

This reverts commit 2e3b22ff1b752b8769200f73951d296e0393ff6a.
Revert "Revert "Bunny/Clyde Collision fixes""

This reverts commit 04690177d7251e9b8dd1a7be9ff2ec4275a2e1ae.