Does this changeset ensure we restore packages similar to WAP?