Fix CSIT regression due to BGPCEP-878 fix