Revert "Small change in AddOn functions"

This reverts commit d8a6c8a7ac4446847da202c989b36f9e0cac29e7.