Dev/issue 6596 aip restore v3

Hrm, I don't think we do... I'll have to take a look at that.