Context/Selector Rules not saved when setup inside Add Variant wizard

Originally posted here, but making it its own bug report now: http://drupal.org/node/532306#comment-1865828

We have found that Selection Rule and Context settings made while in the initial Add Variant wizard never stick. They do work if you go back and edit the variant after you've created it. Here are the steps to reproduce:

1) Open System Task Node Add/Edit Form
2) Click Add Variant link
3) Choose either Selection Rule, Context or both checkboxes on the first screen
4) Click Create Variant button
5) work through the wizard using the Continue button at each step to advance. Add Contexts and/or Selection Rules
6) at the end, click Create Variant button
7) Select the variant from the tabs on the left and choose either selection rules or contexts, and you'll see that rules and context set in steps 1-6 aren't there. going back in and editing them will make them stick.

I spent about 20 minutes last night scratching my head about where the selection rules I had set had disappeared to!