This was technically broken on `master` and only exposed by the changes in this PR.