Please port commit https://github.com/influxdata/influxdb/commit/63498cab4e5b9f310b4e98dc0f782d1080da25dd in to 1.12