Manually reversing e2df30266f for now to apply  a SVN patch