Revert "Fix"

This reverts commit 0e02d637bae8b8cbeb4729fc427e275daa7c01a2.
Revert "Revert "Fix""

This reverts commit 6042aae23eab0747f1f1a2a6ea5c7b330ccba488.
Keep addins stuff