[Bug 557485] Extra provides need trimming