Previous fix for concatenated headers wasn't backwards compatible for