Redo device config based on i9305