roll-back change from commit 1204768 on CDHashMap
bug 497 test case
fix