Fix mismerge from r362687

Hex substitutions and the corresponding test case have not yet been
merged back to this branch, but a mismerge added in the atf_add_test_case.

Back out that line, it'll get re-added with the test shortly.