more re-enstating of some preiov commits.