Restore the .surface pickled field to fix risk disaggregation