7025765c72
This reverts commit 0263a679f2.
Reason for revert: Trying again to confirm if this was the actual cause of regression
Change-Id: I2a663015d7ecdcf315634d8a976bf8294b58981d