Removed the functionality where headers were renumbered. As it turned
out it was costly and didn't help.