Smoking ban set for return to City Council