This reverts commit 730371b6. Reason for revert: ag/21566606 should fix the broken test Change-Id: Ia779a1958098774bc938057444b8eb8e16b6d651