I'd like to do more testing to make sure OTA updates aren't broken by this change. Until we do the testing, let's rollback this change.

This reverts commit 5da08810.

Change-Id: I56a7f47a426cfd3487af1029283bd8ce182d5ab2