Restore the .surface pickled field to fix risk disaggregation
Merged from removing-ruptures-2