This reverts commit 3f5aea69. Reason for revert: Caused crash Change-Id: Id664a6cba297674d8edeb0af700df1e96baaf70e Fix: 312430336