Revert (Hugo is fixing SF for this) "Fix source format warnings"

This reverts commit 8e37264cd160062742809abd9871a8f2568a0926.
SF