Remove more 0-8isms
Remove more 0-8isms
hg forget these two files
merge bug26131 into bug26133