Another package adopted upstream some time ago