Be more consistent when `checkoutCurrentTimestamp` is enabled