Fix name error in uncovered code. :(
Merge branch 'master' into remove-bytes_as_strings