This reverts commit fd825201. The change that fixes this test has been submitted. Change-Id: I35612987b6b149f538b6c6d757eaa626b5349bbd