fix a mess made due to differences between svn and git