Fixup of previous merge from new_logging_format