There, replaced that hack with something saner (in d5e0de8)