af3a32cf6a
We're overriding these in the correct way in `group_vars/matrix_servers` so this wasn't causing any problem in practice.