K 10 svn:author V 3 imp K 8 svn:date V 27 2010-01-06T12:15:10.226616Z K 7 svn:log V 141 Revert r200892, 200893 and 200894. There's companion changes elsewhere that aren't quite ready, and these break the world in the mean time. END