Change broke the build on Debian stable.
This reverts commit 28755439b36ac8e875d764da5db31ad693459ace, reversing
changes made to 64e01ec763d21915e7166e625f8a3e85b46fbcbb.
Breaks Android build.
This reverts commit 12d026c544748521332ad5edfaf123547fa18233, reversing
changes made to 6d678490f51cc0154a0bdedf9dce23c77fdfb991.