Deal with reorganizing away from invalid headers