base: Remove duplicated key handling

Change-Id: Ifd8ecac2b3758f0c6a4dbaa39350831af0b145a0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
(cherry picked from commit f7cd8a4e6fd59e25b1665c5a1e8d75a7348543a2)