Use upstream package