Get rid of problematic config initialization code

Change-Id: Ibea59461d8ddcb50eb7c06b1abbbc0ff9898c54d