5baee1fd78
This reverts commit 0bf6186614.
Reason for revert: Bring back original change
Change-Id: I9326076d0f6006573bf995784292f64f6d6e03a0