Remove FIXME fixed by djasper in r172066.