OK, solved in 61adc98632cf99882498a0c508af1b940fd016bb (I was just trying to be conservative in the changes against trunk)