Would need to rebase against a different upstream branch here if we made it paramaterizable.