682cff7bc8
This reverts commit a967b9dd66fad5b055b071794a4b059feed9fe90. Reason for revert: Check if it's still the case. Change-Id: Ib5496d6bc2ddfe1fedacc4f9c859ac56fc69726e