I'm including this in a seaparate commit to call attention to it, in case the same return value is itself a bug.