I think the change is small enough to fit in this PR... less than 10 lines of code, I think :)