Resolves bug 26931, where comments were not only not being properly stripped out...