Please do not surrender your I-94 yet. You will not be able to come back specially if your visa has already expired.