Description of problem: Resurrect the patches that are commented out in CVS.
Targeting 3.2.0 on FC6 for this.
This can be closed now, right?
Yep. Closing bug.