ef404a786e
This reverts commit 600c508569.
Reason for revert: test no longer fails
Fixes: 358607191
Change-Id: Ie944a7d79dab03fcb61ca62926929b0b462c1ba6