r5593: More reversal of accidental commit.