This reverts commit 30e63f6178.
Reason for revert: Can cause crash for some users?
Change-Id: I4b4e71157b668bbf4320a610ad14ddd10f2eade3
This reverts commit 30e63f6178.
Reason for revert: Can cause crash for some users?
Change-Id: I4b4e71157b668bbf4320a610ad14ddd10f2eade3