This reverts commit 53f15f39. Reason for revert: Caused slower app startup (I don't know why). Change-Id: Id9e3811078bc435073f42996767589a711172400