Revert "Fix an issue that prevented stored value from being repopulated"
Merge commit '234388deec3942f3686f882debdf8999fbe99015'

* commit '234388deec3942f3686f882debdf8999fbe99015':
  Revert "Fix an issue that prevented stored value from being repopulated"