Revert "Merge branch '2023-07-24-introduce-FF-A-suppport'"