Revert upstream change to particle index accounting. (Fixes flicker issues)