Yes, though to be more specific, at both the hub and the switch, I changed AC to non-neutral -> saved -> changed to neutral -> saved, and switch type to ->single pole -> saved -> dumb switch -> saved. I believe at some point after that I pulled the air gap as well.
In two locations for me, I have had problems solved by not just verifying the settings, but moving them off the defaults and back to them.