Fix regression introduced with !81

@cattanem, after some debugging I think that the regression observed in some patches builds is due to 2523298f (included in !81 (merged)).

Unfortunately I cannot really test this change until LBCORE-1772 is completed (local test is running in this very moment).