db297e7ea3
This reverts commit b2b54b0902.
The patch breaks particle distribution even in simple cases, not worth
doing this for keeping a hackish loophole open.