Usually the newer issue duplicates the older issue, but I found that one first and submitted a PR today. This issue has a PR open, but it's out of date.