This reverts commit 41bff6c677. Reason for revert: Droidfood blocking bug: 264504981 Change-Id: I6a69ed326d777766b8798698b647122f1fd44216
41bff6c677