Revert "Change init sequence to support file level encryption"

This reverts commit 98c1a3de23ae8b589c36e74939193c44d25cac65.

Change-Id: I524060418de18f97c3865ebc4435f501015e92ee
1 file changed