Fix for bug 163541: Corrects problem with previous patch that causes primary headers not to appear on some installations.
2xr=bbaetz