Add-on init: Fix mess left after rebase

Not sure how, but apparently I lost some changes in the rebase yesterday. Also not sure how I didn't notice. Anyway, this should do it.