Revert "Use fifo for smoke test to speed it up even more."

This reverts commit 5a2e2c5353349f7aaedec0bd26a1eead1b756cd0.