Restore new config code lost in rebase