storage: revert normalizeKey until we find a better solution (refs #35)