Merge "Fix our *ether* headers mess."