This reverts commit 618578e8. Reason for revert: merged through droidfood weekly Change-Id: I902489ca2cfa488889912515524c118745849a5a