Restore the former code since the wireframes specify to only show units when changing from one to another.