Somehow managed to break this during merge resolution.