Fix the timestamp hack in previous commit