This reverts commit d34b7329935a6f9ffdc9a40c01f7b558e07830d4. Change-Id: I74e63570ce868e6d8c36fd2e1c864419bd6102e4