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