This reverts commit 2b3cef0d Causes crashes in Email, reverting for now Change-Id: Ia0286763d0ab1f90c2b6082d44a6ca804769f49c