This reverts commit 01ab07f9bf. Revert this as its causing random IO perf degradation. Change-Id: I52fde31084eaf3c9bc78f137a63607dbb66bd809
01ab07f9bf