Revert previous commit. There is no reason to fix these issues (which were committed to support creating PO files) in the Sarge version.
Changed paths: