This is an attempt to reland #18488 with less breakage on macOS.
Attach a file by drag & drop or click to upload
