Fixes #2360 and because I am always looking for the corresponding contrib repo PR, here it is.

6 months have passed since 3.6 reached its end of life. Our policy requires we remove support for 3.6.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was some custom time_ns logic just for the 3.6 right?

Yes! Excellent, thanks for the reminder, I have been wanting to remove that 😝