City of Winnipeg to study sex trade after bylaw changes scrapped