spawn_addon, will be reverting this commit.
Revert "spawn_addon, will be reverting this commit."

This reverts commit 49f8903b17ac89e1f7d1cff840a50d2f076aa79e.