Cut some stuff from 2.6 for JFP.