This reverts commit 098a533e. Reason for revert: Base CL caused slower app startup (I don't know why). Change-Id: Ib67852b900ff2baeb34f5d553fb0d233f5475888