Comment 7 for bug 1371647

Having taken a closer look at that, no, there's no possible way for them both to work as-is. I adjusted ids down based on the values in 950... but missed the addition of the entire 960... file. Away goes the pullrequest tag. :(