Reversed the removal of SQL connection params as it is causing unexpected issues some places.