Get tests to pass again on master.

We stopped stripping comments back in:
432b5730003fa0a25a210ff7eaebed33327b3139