This reverts commit 75a7e2f9. Reason for revert: Turns out this wipes out data we need :( Change-Id: Id1d79dec17639440eae55e41fb4e91f0d9e6162c Fixes: 131290765