This actually caused crashes on MacOS, and it is definitely a bug by
any account...


Former-commit-id: e83b11cc611b0a42e4450b455d79a9157645d631