Revert previous commit, and updates faac & live-config patches