I'll look into this later, it's marked with HACKHACK so we can get at it later if necessary.