remove FIXME; fixed by r245733