Revert "Fixed issue causing persistent connection setting to not work"

This reverts commit b852ac639d13aa42bc64daeed31e0564523039cc.