get rid of the with/without-addons split