Revert "Weird test case + x8"

This reverts commit a381ba6b0dd75d93731206bbace3b4ab26880dc4.