Allow disabling of timestamp inclusion.

This is mainly for the tests and has been ported over from NED.