I don't mind wild shape if it's restricted to small animals. The druid turning into a house cat or a bird to avoid detection or get away is fine. It's a nifty utility.
Wild Shaping available as a combat application should not be available to any class that has other major abilities to go with it. I mean, you can have a class completely balanced around wildshape and the flexibility it offers both in and out of combat. If they bring back combat wildshape, it should be on a class that is dedicated to nothing but that.