Revert "use scoped uid"

This reverts commit 955af1deab40ae233c6899892766122b314753c3.