This reverts commit c7a7ee89. Reason for revert: Droidfood blocking bug: 213962104 Change-Id: I370cafcac7e70febbb77a05647a3fd5d0a158abd