Reverts rev 316218 as it breaks parsing the [general] section of sip.conf.