Ugh - work around waitConnected() method name conflict