Also, I no longer wish to try to maintain support for no-polkit. If there is truly a system where that is something we want to support, we can bring back the shims as a compile time alternative.