Remove the old osc-label logic, and get the count right