This reverts commit b5769d3e75.
Reason for revert: This is corrupting the cache with
Deserialization failed, cause: "java.io.IOException:
Invalid flag before ObjectId" [90027-176]
Bug: Issue 8546
Change-Id: I5ddd2d25c75884e616473f7c2cae2df0b4f706ef