Improve restore performance

In MB-59491, we saw restore performance dropped by 18% in 7.6.0. Based on Jim's update in MB-59491, there are some potential improvements. I open this ticket to track the improvement.

Given where we are with trinity I propose we close out this ticket for now, we know that we cannot revert the 10% loss caused by correctness, so we're down to chasing ~8% which we can still do at a later date. #