Updating from 6.3.9 to 6.3.11 causes unused conditional fields to still send with email

I think that this issue has something to do with my problem, but I am not positive. http://drupal.org/node/1137974

I have a multipage form that has lots of conditional field sets. I'll try to outline my format:

Page 1 - Product Types (Flooring is 1 out of 5 options)

If Flooring is selected, you get another page (Page 2) with a field called Flooring Types. This is the only field on this page and is conditional to Product Types. Thus page is skipped is Product Types does not equal Flooring.

If Wood Flooring is selected, you are then directed to the next page (Page 3) with specific questions about Wood Flooring. All these fields are mandatory and in a Fieldset. The Fieldset is conditional to display if Flooring Types = Wood Flooring. The individual fields do not have conditions, as the parent fieldset contains the necessary conditions.

In 6.3.11 the conditional logic still works on the screen, however even if a fieldset was not displayed (with or without mandatory fields) all the fields still are sent in the email. This is resulting in 3-4 page emails with tons of empty fields that are irrelevant to the form being submitted.

Are there new settings that I have missed somewhere or is there a bug in the conditional logic?

Thanks for any help - and let me know if you need more details.