Try to address some of the issues of r70608.