Revert auto select db feature
Merge pull request #479 from romainneutron/autoselect-db

[3.8] Revert auto select db feature