I'm working on a PR for `bdk` that addresses this [`bdk_wallet#147`](https://github.com/bitcoindevkit/bdk_wallet/issues/147) and we need to make these changes here as well.