ac7db52a91
This reverts commit de74f01f01.
Reason for revert: regression
Change-Id: Ia21a7bfb5cb98e0219e32d884d773276ba804e6b