Removed new uses of the "label" property which were introduced after the previous commits on this branch were written.