Summon Companion - should turn off /guard?

[bulbousaur]

Was soloing in Kael and set my shaman pet to /guard at the entrance. Then I ran further in and started to set up camp. I summoned pet, and he immediately tried to run back to where he had been set to guard and agroed multiple mobs.

Maybe this is the way it was in classic, but I would think that maybe the pet's /guard should be turned off and he set to /follow when summoned? Thanks.