Note: upstream merged part of configuration to default definition. We
should probably include that as well. This does not implement that. When
this patch is about to be pushed to upstream we should integret this in
better way.