Usman Khawaja has been an ornament to Australian cricket, but the time has come to put him back on the mantelpiece.