Comment 2 for bug 955618

Might be better to break that change out to a separate review?