Hi, looks like a nice example of why hacks shouldn't be allowed to live so long. I just reverted the two commits, hoping for Max L. to come up with a clean solution ;) PS: We need a "wall of shame" wiki page :P