I suggested this for another guy that might be worth trying, instead if relying on a fix from ST. I will paste my posts from that thread here:
Worth a shot.