Revert changes to straight flush code