reveret to apr26 commit (new dev in branch)