94a9dca7fc
This reverts commit 67c85d8fc2.
Reason for revert: Test is stable
Change-Id: Ie76ff933c2871278ba0a86291ed73c118231cbdc