(#1533) - no massive file rewrites