Removed QSA fix from different branch.