I'm not willing to add that kind of hack to this PR. This is just about fixing defaults.