Simplify configuration.
PR: 244812 Submitted by: John Hein <jcfyecrayz at liamekaens.com> (with modification)