This reverts commit d2c3a7d7cca2bd828266cd362b00d7d2dfd41f5c. Change-Id: Idd6e026369a191b5e4449c8decbba8d08e20de92