This reverts commit 6275d490. The fix has been pushed to droidfood. It should be reverted now. Change-Id: I656c1a49fe8b2db5dc427119ec3278c6bfdcd570