Revert r1158166, obsoleted by r1158209.
Revert r1158166, obsoleted by r1158209.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion