Revert "framework:base: iterator error in singletone provider"

This reverts commit a52e702b3a48236a95a1322f3adc000093aa2a62.