Yes, and templates too.
Oddly, I haven't seen this bug in a looong time either, then started seeing it a bunch again. However, now that I think about it, I didn't really swap templates that often. I'll give that a try and see if that helps. I suspect it will because I was swapping to a template that didn't have water utilities setup correctly yet. Thanks for the tip.