Panel variant export includes incremental $pane->pid causing feature override

I noticed that if several panel variants for the same page type (e.g. node_edit) are created by different feature modules then features considers them overridden due to the incremental $pane->pid.

Sample:

$display->panels = array();
  $pane = new stdClass();
  $pane->pid = 'new-1';

They seem to import ok with Features and take on a new pid in the db, but now Features considers them overridden because the pid value is different in the db from the code.

I'm guessing this is similar to #813754: Ability to set variant machine name in Panels UI. I'm working around that particular issue my manually altering the machine_names in the feature export. However it may get a little extra tedious if that's necessary for panes.

Recommendations?