Revert "change to the franco team tunables for cfq as well"

This reverts commit 122f97a3b840d15d8eea1b98c390cd66f468e7dd.