This reverts commit 491378a3. Reason for revert: Break Elfin Bug: 130669566 Change-Id: I07c6883872ed9033ec5edbf27b0bd423ead39962