Revert "Change init sequence to support file level encryption"

This reverts commit d815178b7512cb44d8b5f234e3f823b5a3e44dea.

Change-Id: I7e3f55d3092fcd04ea9f62f1971c9d42570f096c
6 files changed