Recover original save_data code

Should have been on the initial dump.