Revert auto select db feature