This is now fixed, using the lovely new `WrappedTime` type.