This reverts commit c9032b1472f4f54b6a7db66921975c808e7db88d. Change-Id: Ia590d767ed5c280369fbcecd65538c7fc25158a1