This reverts commit c68d8124. Reason for revert: Broken test Change-Id: I91bc693f508a947dea95ee3483045790927f88c9 Fixes: 158626593