In T217041 the timestamp was changed (for some but not all) events, from using "+00:00" to "Z". We were manually removing "+00:00" from the timestamp string before saving the data, so we got an error when the code encountered a Z.

We need to check for either, or just trim the string directly by length to cover both cases.