libcore test fails. This reverts commit cc99df23. Change-Id: I5bac595acd2b240886062e8c1f11f9095ff6a9ed