[4.2] Revert Change Casuing A Double Connect

PHP will always evaluate both sides of the &&, so we are always calling the connect function.

---
This reverts f1ab0a4cfdbc6d9df20719444f088a6ac4366bb7.