Now this should work nicely again. Somehow I thought I'd committed this change already, but anyways, here it is.