This reverts commit cc862fa6. It turns out that some people like this behavior and we've received various user complaints about it.