Changed onSave/RestoreState Implementation

This seems too simple, but then again maybe that's all it is.