is this actually part of this PR or is this another artifact of a bad merge?