This reverts commit 537d8d9e. Reason for revert: Broke build Change-Id: Ia69c60050203b1124baf8d1304e837854a1f8bc9