3dd64ca3a8
This reverts commit 1186700c9a.
Reason for revert: Fails in the lab
Change-Id: I6715a058c76d96752b904331968b46a07ce93f85