get rid of with/without-addon split