Merge "Revert "Decode key returned from db into unicode.""