Reinstated what was pretty much the original tracking by abusing headers