Further fixing done to get archive load to work with 14.11.  Continuation
to commit fa73701ec3.