This reverts commit eef5409d.
I suspect this has caused a lot of the CI instability today -- some flakes were already added, but the a630-traces job is still flaking. Revert until a fix makes it stable.
@tomeu @robclark