[Michael Haensel]

Thank you very much! This way fans of the old behavior can stay happy, but you have the (possibly more consistent) new behavior for new users.