This reverts commit 36f8d22c. Reason for revert: Seems to be breaking test 687 Bug: 115837065 Change-Id: I83bb1a9d76cc701c3d582778e5047ebd5dab5d29 Test: TreeHugger