Sometime we should be looking at whether we should convert to flat packages. Ages ago Teddy asked me not to PR that change