partially revert d3bd6b2 causing exceptions on init/connect