ENG-6897: Use flush

Sure..either way client should be drained but I can switch.