7e390c3b17
This reverts commit 2bdac8f7e5.
Reason for revert: Reverting and added fix to crash
Change-Id: I20508eb05c85ba5dfba52630aa9becea270f890b