Is this change leaking from another PR? (It's :+1:, but maybe should be in its own commit.)