The individual packs were not discontinued, I e-mailed them a while back when they were hard to find locally and they said they were going through a packaging change.
I found an online show store at the time who had a bunch in stock and ordered them.
Now I'm finding them in stores again but the packets are for 32oz bottles rather than 16oz so I have to close up and carry a 1/2 empty packet when I use one.
The G2 I still find in the packets for 16oz bottles but even though they say there is no sugar substitute in them I still get the funny after taste afterward. At least I don't get the headache like from a diet drink.