Re-add timecop (borked in bad merge)