Revert back to old localStorage mechanism