This reverts commit b04c57ba980793c43b79c9d889e94e3cd164e8ad.
Change-Id: Ia669ea1f2efbae46290e4ea5f860cdd3671277b4
Change-Id: I5489606fa98dc78c0b864b95a98def41ce6d1f67