This reverts commit 024c49da because it breaks Google internal tests.
Attach a file by drag & drop or click to upload