Extended and aligned comment header (via franz-josef-kaiser)
Revert "Extended and aligned comment header (via franz-josef-kaiser)"

This reverts commit 0f2675ddb4de63da4b1ffb9152fca5a2532dcdc7.