Comment 5 for bug 1358360

Assuming this doesn't affect it, there is that giant red banner when run as root, warning the user, so it's probably ok :)

I will try to review/test the changes soon, thanks.