Some of the code has been merged upstream. This is reminded to remove that code from collision in time for the Awesome 3.6 release.