Use Org headers instead of discarding them.