Reverting feature recreates Workflow states with new IDs

Hey,

I'm facing a problem with the Workflow module which makes it impossible for me to implement changes after a Workflow-based feature has been initially deployed on a production site.

Whenever I revert a feature's Workflow component, no matter how tiny the change is, the Workflow entirely disappears from my list until I clear the cache. Once the cache is cleared, the entire feature is marked as Overridden, because the workflow states have all been re-created using new SIDs. This very obviously breaks existing content which has Workflow Fields, as well as views which depend on certain states, as all of these things seem to be based off the SID rather than a machine name.

I've lengthily looked at issue #2484297, and I've understood that the patch in post 19 of that issue fixes the problem, however I don't see any trace of the code in neither the 2.8 version, nor the current dev branch.

How should I proceed? How to apply changes to the feature without having to lose the state IDs?