backport of maxDataPoints jitter patch