4d1fe6b854
This reverts commit eb65ca1600.
Reason for revert: issue stopped happening
Change-Id: Ib9313e0df9768ad17f3c8c7bd52cb45eb457b5cd