Revert 'Progress on collision jitters'

We will be using a different approach.