revert init changes

Change-Id: I8c25a87dd8a95bc6190cd351448129d99265e00e