Revert exposing getStorageKey.
Merging origin/goliver/master-pending-revert-expose into master