This reverts commit 6f4657363cac93ddcc718d9716e3b138f770f2e2. Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012