This reverts commit 2e1e671d96.
2e1e671d96
Squashed merge of particleInteractions up to commit e7cb5bcf0315c359539ef1e715e1d51991343391