This partially reverts commit ae7228c6. I guess the old behavior was slightly more popular. Fixes #1693 (probably). (cherry picked from commit 699fc0e51e)
ae7228c6
699fc0e51e