...okay, adding timestamps back as opt-in