Revert "Fix build on older APIs, take 2"

This reverts commit c99f7d48bac368d8fd02f347e87ad576e33f1945.

Reason for revert: build break

Change-Id: I21c47880a0647342075aee628cfe301b9920899c
2 files changed