[PATCH] Fix AIX build break.

[Ciaran Woodward]

> What if we remove the scoped_restore use and just do the save/restore
> manually here instead?

Works for me, I'll submit a patch later.

Cheers,
Ciaran