Merge "Fix config-only thinko"