If you rebase now that #2098 is merged, this can go away.