Controversial Rezoning Issue Passes City Council