This reverts commit 08e2895a. Reason for revert: shouldn't be used in recovery Change-Id: I2ac8918800b577fc37c1e0ea459ffc872847f60f