This was introducing a regression with influxdb output, leading to
collision an points missing.
This reverts commit 53f40063.

closes #1724
closes #1796