The new logic is also flawed.  Revert "Make sure Samba optimization FW rules get properly handled."

This reverts commit d31d9b33a382da4995a55049b57a420f129b8426.