Re-do svn copy from r106516 preserving history