Revert "Don't force x86 devices to run an insanely long test."

This reverts commit 0cfb7262e5ea1bfaa745cf24e60751c86d5c7164.