Attempt to add restartability to free surface