Revert "addons"

This reverts commit ec6987a215e214b8ebeadd8e2eedef6b75ba5fd3.
Revert "Revert "addons""

This reverts commit ea4c393573a1de3d394f16d5098e06e014bf7943.