Put back some packaging related changes that we need.