Revert r11541, lundblad and I came up with a better solution.
Revert r11541, lundblad and I came up with a better solution.

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