Test fails on arm. This reverts commit 2d45b4df. Change-Id: Id2864917b52f7ffba459680303a2d15b34f16a4e