90935/90960-90962 with AKI

Am I correct in saying that if you are billing 90935 or 90960-90962 and the patient has Acute Kidney Injury on top of CKD3, you would have to use ICD-9 code 584.9, not 585.3?