Use upstream github lib