Avoid turning timestamp into JSON

Addresses #1583