Andrew Lewman
revert r21309 and r21310
Andrew Lewman commited 69b926644 at 2009-12-22 04:42:35