I literally have a fork waiting to be submitted for a PR once this lands that fixes this.