We want to stick to upstream defaults as much as possible. As pointed out by @8573 in #16999, this was not the case.