When prefix doesn't match, was deleting entire .6 file. R=dsymonds CC=golang-dev https://golang.org/cl/4427041