Revert mergeinfo changes made in r289235 -- this did not work
I'm ditching svn and moving to git-svn after this (ugh)