Remove some manually set options, that are set to the default value

These are the only places where these options are overridden.
Merge pull request #1122 from mstorsjo/remove-hardcoded-defaults

Remove some manually set options, that are set to the default value