Revert r1296868, as it is wrong/unnecessary.  See its thread for details.
Revert r1296868, as it is wrong/unnecessary.  See its thread for details.

Found by: philip

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