More troubles because the fix from the Debian bug didn't match the fix actually NMU'd. :-( Now this fix really should work. Third time's the charm after all, innit.
