Fixes #6105: Reverts group module headers to 1.8 markup