Revert "Impoved collision between Shell and Rock"

This reverts commit 8a0485d8db010b655d2a220b270f17021a86579f.