This reverts commit 447ae504978c5a1ec94ba13ea5a62fb4eebc1b6a. Change-Id: I972ff1ebd616ae3eb9eb375082393ff5ce1e942b