Fix old reference to ConfigHolder (tx for review @jerith).