Revert kick changes since it interferes with iometer perf measurements.