This reverts commit 28fe808d7e. Not needed after https://github.com/influxdata/influxdb_iox/pull/955 is merged
28fe808d7e