Backed out changeset c6907a76e925 for wrong commit message/bug #.