Rajko assures me this works for most people, so I'll leave it until I get more feedback one way or another. This reverts commit c60f5846d6.
c60f5846d6