Actually apply timestamp bug (bug #3961)