Fix bad merge

Broken Merge: bc82d3e4f0f92f9ac97ddd58949a56261f6ee8bc
Commit that introduced `time`: c9d388bccae7e4212803010d4cae51d77a57fc1a