Changed the way the Database is selected from the Connectionstring
Revert "Changed the way the Database is selected from the Connectionstring"

This reverts commit 5ccaf9ce9955e04cad2e3a940f8fe45adb2a9e16.