moving changes back into what we are trying to merge into chef.