fix issue #2105

 - fixes issue #2105
   + only attempt to restore a given header if the provider has a
      RESTORE_HEADER_KEY