This reverts commit a2deca9d: config_map had
been introduced on purpose with bfb97833
"configmgr: faster / simpler compare for keys."

Change-Id: I3ae0edc4d23977c6537bd2f462f90a702266de6d