This reverts commit 08e467dd (Google test failures after merge).
Attach a file by drag & drop or click to upload