Revert "Fixed a few broken files"

This reverts commit 17c4c57a4ec671b42f27e794308bdd35e2c92fe3.

This breaks call log.

http://i.imgur.com/MsGMo76.png

Change-Id: I6031c5c923ce876da083a322cde9feda0545c7fa
Merge "Revert "Fixed a few broken files"" into jb43