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