all: (really) update worch with upstream (6caa06c)