Bug 883053 - Restore the original connection when connection fails.
Merge pull request #10504 from crh0716/883053

Bug 883053 - Restore the original connection when connection fails.