8fe1d9dda1
This reverts commit 2535fac296.
Reason for revert: Bring back original change
Change-Id: Ie20e80f6e9b7d67a28e3a255abaf82018eb61e7a