Temp fix for broken Superuser
Revert "Temp fix for broken Superuser"

This reverts commit 3cfcd8db97ccb4060d144817c8d0256662f2f51b.
Revert "Revert "Temp fix for broken Superuser""

This reverts commit 77f100f5573364399bb163279e37d3b4173402b3.