Disable binlog configuration as it is anyway broken.
Fix some more old upstreams code.