cf3df12106
This reverts commit fe5206e50a.
Reason for revert: Bring back original change.
Change-Id: I15c5f288bc50107831a494a81d1f16df4c2ade27