Remove extra dependency on addon type.