[3.8] Revert auto select db feature