86046044b7
This reverts commit 91602f658c.
Reason for revert: failure no longer reproducing
Fixes: 325659406
Change-Id: Ibaaf46ac012b20ab0a901e2794860faae3a53426