I definitely grew up with this exact same second verse, and I entered kindergarten in 2001 in the Seattle area. I also vaguely remember getting in trouble for singing it because of the whole “promoting public urination” thing.