Commit r20366:20368 again.