The test fails its checker parts. This reverts commit debeb98a. Change-Id: I49929e15950c7814da6c411ecd2b640d12de80df