I ran into another patch problem in the falcon-st-opt patch, and since it appears most of the changes have been merged already I am removing the patch.