This reverts commit 083923d9. Reason for revert: No longer correct, this will be in API 26. Change-Id: Iaf82d797405135fcd30455fd750b23fc57e9623a