Hmm, in a different location I came across this plant which can only be Shrubby Jerusalem Sage (Phlomis fruticosa) given its deadhead or seed pod (not sure what to call it) and yet it does NOT have a square stem. I couldn't take a lot of time examine it, what with a wife, a tween and a dog all demanding my attention. Perhaps the more mature parts of the plant had square stems. I examined a couple that were easy to reach and fairly new growth.