Hrm it's not obvious to me at a first glance where you call this from... I'm going to patch your diff to take a closer look