Revert 6587 - Optimize entity-entity collision (#7539)