This is a small fixup because cherry-picking the relevant commit threw it into the wrong place...
See #1846