upstream bug #71

In this example I remove all distro specific code and let user handle it