This commit causes an NPE when getting from the config in some states, given upstream issue and PR in the works, I have 0 inclination to debug this This reverts commit e4358b8217126bbcc3a38b0d17097ad5ab87c50a.