Fix a merge error where an old configuration key appeared.