This reverts commit c549e19c5e.
Reason for revert: Droidcop: Potential culprit for Bug X - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I2ab42d96d2599dfcc946fa48b3940e2bd92b22b0