This reverts commit 17b1e9fbe6.
17b1e9fbe6
This is less confusing IMO. The dialog will shown up only if users decided to in the preferences, so that will not bother users who don't need this. This reuses lot of things from Alan contribution from #4484