This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918. Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11