Whatever you do, may not matter too much. The safest way: go to your local USCIS, give your I-94 to the officer.