Fails libcore tests. This reverts commit afbd71ff. Change-Id: I611620f915025a0c077a78a480b2b730b3be3de8