Undo #2194

[zhassan-aws]

Description of changes:

The PR that fixed #2187 (#2194) broke #1949. Opening this PR to undo #2194 until we find a more reliable approach to fix #2187 (tracked by #2275).

Resolved issues:

Resolves #1949
Reopens #2187

Related RFC:

Optional #ISSUE-NUMBER.

Call-outs:

Testing:

• How is this change tested? Added a new test

• Is this a refactor change? No

Checklist

• Each commit message has a non-empty body, explaining why the change was made
• Methods or procedures are documented
• Regression or unit tests are included, or existing tests cover the modified code
• My PR is restricted to a single feature or bugfix

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

[celinval]

Are you able to also add a small test that reproduces this issue?

[zhassan-aws]

Are you able to also add a small test that reproduces this issue?

Do you mean the issue in #1949? If so, I did add a small test in my previous fix for it (see #2005), but turns out that the test doesn't fully reproduce the issue in the chrono crate (because it didn't fail in #2194), and so this time, I decided to add a test with the chrono crate itself.