Breaks libcore tests. This reverts commit 8f301e26. Change-Id: Iea46176118be9e05aceb06f2d290961bb1f38265