Revert "Try moving addon setup earlier"

This reverts commit 6292fa35ca524ebc52f938b2f5e800a27528f7bb.
Fix indentation on matrix to restore builds