Revert "FF fixes"

This reverts commit 61fbb1e60be9768396533722526cb9f4571bad1d.