Reverting r211950 -- it did not help resolve the -Wcomment warnings triggered in GCC.