Consider reverting commit 2265251

There has been negative feedback from users, the change clearly broke some people's habits and is causing them frustration. As there never were any requests to change the behaviour to begin with, I'm afraid this change was a bad decision.