back out r7036.
I mistook merged revision of the revision comment. r7035 is wrong. r7033 is correct.
Authored by: tmaruyama 2011-09-02
Parent: [r7036]
Child: [r7038]
