I understand your pain. Our decision was project related, so that might not apply to you.
Did you do any work on this? I didn't have the time so far but I could look into this issue at the weekend.