Make sure the removal of mappings uses the same logic that put the
mappings in place.
Signed-off-by: NMyron Stowe <myron.stowe@redhat.com>
Signed-off-by: NLen Brown <len.brown@intel.com>