The patch address here should be changed to the eventual address of the patch location in this repository when this is merged.