After ICS, USB Weirdness

[colestein]

The ICS update was pushed to my unrooted phone today. Before, when I plugged the phone into the computer, it would charge the phone, and I'd have to select "disk drive mode" to access the storage. Now I plug in and it immediately tells me that it's connected as a media device (mtp). Only other option I have is camera mode (ptp). How do fix this? It's not really doing me any good to have the computer recognize this as a device right away.
Also, I DO have debugging on.

Thanks a lot!!