fix yifi merged from ruudburger repo
Revert "fix yifi merged from ruudburger repo"

This reverts commit c5968b6e5260232694dc9b16948b97de07811bcc.
Revert "Revert "fix yifi merged from ruudburger repo""

This reverts commit 8a0cbe2dc22d2bf25d14a6348e770d7e3491b2d8.
fix yifi merged from ruudburger repo