Attempt to replace the Ubuntu fix by a more generic fix that does not depend on a distribution name. See also #71.