init: fix @nardholio's derp

Change-Id: I6d8904ab84a766deeea961d8ce0c56c8ca1d566f
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Revert "Fix CM merge init issue"

This reverts commit 406ea90bd1f25e38955fa9c6dbf01bfc4e1bcf3c.