z_drive: got changes back from bad push