K 10
svn:author
V 6
kevans
K 8
svn:date
V 27
2020-06-28T02:29:53.628036Z
K 7
svn:log
V 233
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.

END