After !1158 we don't have larger changes in PhoshShell so we can finally drop the priv-> indirection here.
I've made this two commit as most of the cleanup can be made via sed so we can just reapply it just before merging.
After !1158 we don't have larger changes in PhoshShell so we can finally drop the priv-> indirection here.
I've made this two commit as most of the cleanup can be made via sed so we can just reapply it just before merging.