Revert "LPS-35561 get source formatter bug fix code from Hugo"

This reverts commit feffd169b6c208ef9bb6841a3802dbbb6f0dbd53.