Accidentally merged the configdb branch into master. Reverting.