Breaks Android build. This reverts commit 12d026c544, reversing changes made to 6d678490f5.
12d026c544
6d678490f5