
This reverts commit 2d9e500523a71f2da57f7eea9654ffa99f001a0d. In addition, this fixes broken Android tests of the original PR.
This reverts commit 2d9e500523a71f2da57f7eea9654ffa99f001a0d. In addition, this fixes broken Android tests of the original PR.