Revert to older version and apply Dror's changes