Fixup connect/reconnect to remove previously hardcoded JSON