* Update snapshot and drop unused workaround * Drop unnecessary fix --------- Co-authored-by: GG Bond <whatever@tagkong.com>