99c442b015
This reverts commit d82503fc42.
Reason for revert: Introduced crashes
Change-Id: I0956f746e25ccfe655169580fd802d33f99c0652