This reverts commit 2d9e5005. In addition, this fixes broken Android tests of the original PR.
Attach a file by drag & drop or click to upload
