Revert "Drop the const_iterator."

This reverts commit 6af6bf74e4735e98eac65381a8c6c4de2902fa6b.
remove directory resulting from merge