This reverts commit 0a8941c583 since it may not be required as we start pooling with single connections only.
0a8941c583