Revert "Fix building with 4.3's bionic"

This reverts commit a02fbffce9029e3eaa63dfc5f3e79a79da033e4c.