Revert changes in ConnectionPool and fix driver