This reverts commit 69ee26a389. Reason for revert: Break in Elfin Bug: 130669566 Change-Id: Ia44fd087981770676a6887aa390c674c2855f4cb
69ee26a389