This reverts commit 336e301e5cdbd705c01d1bfc44470493390178a2. Change-Id: I6f3550e3134d31a6ec618e13061073a51162161a