If it were up to me, I would drop the ‘until’. Islam is islam. It isn’t about the good V the bad. It is what it is. The values of islam are ones that up to now we as Western civilized people flatly reject. Pretending that islamic values fall within our ethical system except for a few extremists is destroying us and is a trick designed by the founder of islam, the pirate mohamed. The people who do the killing are not extremists. They are just the sharp end of the spear.