Revert "block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq"

This reverts commit 55619fb1e71ceaf6661833298ed115630977dfa7.