This reverts commit e4ab72d54cf41d16819b72e94d9b0d0d51289647. Change-Id: Id17170312c75993fc1f7859d52c7e050b2aeaf80