GitLab

When backporting #20902 in #21058 there was a slight misbackport. It was
missed that we needed to remove the global command option before setting
the settings.

Fix #21805
Signed-off-by: Andrew Thornton <art27@cantab.net>