7f52f4090c
This reverts commit 17ba630cd9.
Reason for revert: For unknown reasons, the problem had fixed itself
Change-Id: Ifdf884a4ca0e3cd96d85da2725216fd34bfdcbe0