Changed to not use /headers directory