Revert "FIX-FAP addons"

This reverts commit 4061c3d4da6e7eb90ae7f82e3fed8b8377c7b27b.