Revert r16446 and r16485 in preparation for a more comprehensive fix.
Revert r16446 and r16485 in preparation for a more comprehensive fix.

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