This reverts commit 85bad9b5. Change-Id: Ic68475a8df0ae377c4fc357017b7d2a6b5311433 Fixes: 79155510 Fixes: 79156480