This reverts commit ec91d48c. Reason for revert: Breaks libcore tests. Change-Id: I0ea55f74635332177eadd9a69fb831e7f5dc16c7